bitkeeper revision 1.1159.223.29 (41f577e7ZJYpBbgJi8udTXWyfHvSYg)

Cset exclude: iap10@labyrinth.cl.cam.ac.uk|ChangeSet|20050122214333|39257

diff --git a/Makefile b/Makefile
index 5fcdc9f74c1818d44034ca513860543b5be7124a..924fbfbaca08bc8dd9846e263a7a572abcd70fb8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,26 +31,27 @@ all: dist
 
 # install everything into the standard system directories
 # NB: install explicitly does not check that everything is up to date!
-install: xen.install tools.install kernels docs.install
+install: install-tools install-xen install-kernels install-docs
 
-kernels.install:
+install-xen:
+       $(MAKE) -C xen install
+
+install-tools:
+       $(MAKE) -C tools install
+
+install-kernels:
        cp -a $(INSTALL_DIR)/boot/* /boot/
        cp -a $(INSTALL_DIR)/lib/modules/* /lib/modules/
        cp -dR $(INSTALL_DIR)/boot/*$(LINUX_VER)* $(prefix)/boot/
        cp -dR $(INSTALL_DIR)/lib/modules/* $(prefix)/lib/modules/
 
-docs.install:
+install-docs:
+       sh ./docs/check_pkgs && $(MAKE) -C docs install || true
        sh ./docs/check_pkgs
        -$(MAKE) -C docs install
 
-xen.install tools.install: %.install:
-       $(MAKE) -C $* install
-
-xen.dist tools.dist: %.dist:
-       $(MAKE) -C $* dist
-
 # build and install everything into local dist directory
-dist: xen.dist tools.dist kernels docs.install
+dist: xen tools kernels docs
        $(INSTALL_DIR) $(DIST_DIR)/check
        $(INSTALL_DATA) ./COPYING $(DIST_DIR)
        $(INSTALL_DATA) ./README $(DIST_DIR)
@@ -63,7 +64,8 @@ xen:
 tools:
        $(MAKE) dist=yes -C tools install
 
-kernels: $(addsuffix -build,$(XKERNELS))
+kernels:
+       for i in $(XKERNELS) ; do $(MAKE) $$i-build ; done
 
 docs:
        sh ./docs/check_pkgs
@@ -73,13 +75,17 @@ docs:
 kbuild: kernels
 
 # Delete the kernel build trees entirely
-kdelete: $(addsuffix -clean,$(XKERNELS))
+kdelete:
+       for i in $(XKERNELS) ; do $(MAKE) $$i-delete ; done
 
 # Clean the kernel build trees
-kclean: $(addsuffix -clean,$(XKERNELS))
+kclean:
+       for i in $(XKERNELS) ; do $(MAKE) $$i-clean ; done
 
 # Make patches from kernel sparse trees
-mkpatches: $(addsuffix -xen.patch,$(ALLSPARSETREES))
+mkpatches:
+       for i in $(ALLSPARSETREES) ; do $(MAKE) $$i-xen.patch ; done
+
 
 # build xen, the tools, and a domain 0 plus unprivileged linux-xen images,
 # and place them in the install directory. 'make install' should then
@@ -90,14 +96,16 @@ world:
        $(MAKE) dist
 
 # clean doesn't do a kclean
-clean: xen.clean tools.clean docs.clean
-
-xen.clean tools.clean docs.clean: %.clean:
-       $(MAKE) -C $* clean
+clean: 
+       $(MAKE) -C xen clean
+       $(MAKE) -C tools clean
+       $(MAKE) -C docs clean
 
 # clean, but blow away kernel build tree plus tar balls
-mrproper: clean $(addsuffix -delete,$(ALLKERNELS)) $(addsuffix -mrproper,$(ALLSPARSETREES))
+mrproper: clean
        rm -rf dist patches/tmp
+       for i in $(ALLKERNELS) ; do $(MAKE) $$i-delete ; done
+       for i in $(ALLSPARSETREES) ; do $(MAKE) $$i-mrproper ; done
 
 install-twisted:
        wget http://www.twistedmatrix.com/products/get-current.epy
@@ -159,8 +167,13 @@ uninstall:
        rm -rf "/usr/lib/python2.?/site-packages/xen* /usr/lib/libxc* /usr/lib/python2.?/site-packages/Xc*"
 
 # Legacy targets for compatibility
-linux24: linux-2.4-xen0-build linux-2.4-xenU-build
+linux24:
+       $(MAKE) linux-2.4-xen0-build
+       $(MAKE) linux-2.4-xenU-build
 
-linux26: linux-2.6-xen0-build linux-2.6-xenU-build
+linux26:
+       $(MAKE) linux-2.6-xen0-build
+       $(MAKE) linux-2.6-xenU-build
 
-netbsd20: netbsd-2.0-xenU-build
+netbsd20:
+       $(MAKE) netbsd-2.0-xenU-build

diff --git a/xen/Makefile b/xen/Makefile
index df01937245f53131d40c7822b0cb5400602f8dcc..52810f207ad5c2aa2db5e310279ff58e39940979 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -32,14 +32,15 @@ install: $(TARGET).gz
 
 dist: install
 
-clean: tools.clean common.clean drivers.clean arch/$(TARGET_ARCH).clean
+clean:
+       $(MAKE) -C tools clean
+       $(MAKE) -C common clean
+       $(MAKE) -C drivers clean
+       $(MAKE) -C arch/$(TARGET_ARCH) clean
        rm -f include/asm *.o $(TARGET)* *~ core include/xen/compile.h
        rm -f include/asm-*/asm-offsets.h
        rm -f tools/figlet/*.o tools/figlet/figlet
 
-tools.clean common.clean drivers.clean arch/$(TARGET_ARCH).clean : %.clean:
-       $(MAKE) -C $* clean
-
 $(TARGET): delete-unfresh-files include/xen/compile.h
        [ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm
        $(MAKE) -C arch/$(TARGET_ARCH) asm-offsets.s